From c0b77a29413237b0d674e8c115542183ae04d25a Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Fri, 25 Aug 2017 16:52:41 +0200 Subject: [PATCH] range: Update to using GdkEvent API --- gtk/gtkrange.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index 8bdc93a4e5..18bd615d18 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -1871,13 +1871,17 @@ gtk_range_key_press (GtkWidget *widget, GdkDevice *device; GtkRange *range = GTK_RANGE (widget); GtkRangePrivate *priv = range->priv; + guint keyval; device = gdk_event_get_device ((GdkEvent *) event); device = gdk_device_get_associated_device (device); + if (!gdk_event_get_keyval ((GdkEvent *) event, &keyval)) + return GDK_EVENT_PROPAGATE; + if (gtk_gesture_is_active (priv->drag_gesture) && device == gtk_gesture_get_device (priv->drag_gesture) && - event->keyval == GDK_KEY_Escape && + keyval == GDK_KEY_Escape && priv->grab_location != NULL) { stop_scrolling (range); @@ -1885,8 +1889,8 @@ gtk_range_key_press (GtkWidget *widget, return GDK_EVENT_STOP; } else if (priv->in_drag && - (event->keyval == GDK_KEY_Shift_L || - event->keyval == GDK_KEY_Shift_R)) + (keyval == GDK_KEY_Shift_L || + keyval == GDK_KEY_Shift_R)) { GtkAllocation slider_alloc; @@ -2425,7 +2429,7 @@ gtk_range_event (GtkWidget *widget, GtkRangePrivate *priv = range->priv; gdouble x, y; - if (event->type == GDK_LEAVE_NOTIFY) + if (gdk_event_get_event_type (event) == GDK_LEAVE_NOTIFY) { priv->mouse_x = G_MININT; priv->mouse_y = G_MININT; -- 2.30.2